@@ -9,12 +9,12 @@ from curtail_uuid import CurtailUUID  | 
            ||
| 9 | 9 | 
                from django.conf import settings  | 
            
| 10 | 10 | 
                from django.contrib.auth.hashers import check_password  | 
            
| 11 | 11 | 
                from django.core.files.storage import default_storage  | 
            
| 12 | 
                +from isoweek import Week  | 
            |
| 12 | 13 | 
                from logit import logit  | 
            
| 13 | 14 | 
                from TimeConvert import TimeConvert as tc  | 
            
| 14 | 15 | 
                 | 
            
| 15 | 16 | 
                from account.models import LensmanInfo, UserInfo  | 
            
| 16 | 17 | 
                from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo  | 
            
| 17 | 
                -from isoweek import Week  | 
            |
| 18 | 18 | 
                from message.models import SystemMessageInfo  | 
            
| 19 | 19 | 
                from pay.models import OrderInfo  | 
            
| 20 | 20 | 
                from photo.models import PhotosInfo  | 
            
                @@ -1,6 +1,6 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -import redis  | 
            |
| 3 | 
                +import redis_extensions as redis  | 
            |
| 4 | 4 | 
                 | 
            
| 5 | 5 | 
                 | 
            
| 6 | 6 | 
                def redis_conf(conf):  | 
            
                @@ -4,13 +4,13 @@ import xmltodict  | 
            ||
| 4 | 4 | 
                from django.conf import settings  | 
            
| 5 | 5 | 
                from django.db import transaction  | 
            
| 6 | 6 | 
                from django.shortcuts import HttpResponse  | 
            
| 7 | 
                +from isoweek import Week  | 
            |
| 7 | 8 | 
                from logit import logit  | 
            
| 8 | 9 | 
                from TimeConvert import TimeConvert as tc  | 
            
| 9 | 10 | 
                from wechatpy import WeChatPay, WeChatPayException  | 
            
| 10 | 11 | 
                 | 
            
| 11 | 12 | 
                from account.models import UserIncomeExpensesInfo, UserInfo  | 
            
| 12 | 13 | 
                from group.models import GroupPhotoInfo, GroupPhotoOrderInfo  | 
            
| 13 | 
                -from isoweek import Week  | 
            |
| 14 | 14 | 
                from pay.models import OrderInfo  | 
            
| 15 | 15 | 
                from photo.models import PhotosInfo  | 
            
| 16 | 16 | 
                from utils.error.errno_utils import GroupPhotoStatusCode, OrderStatusCode, UserStatusCode, WithdrawStatusCode  | 
            
                @@ -10,13 +10,12 @@ from django.db import transaction  | 
            ||
| 10 | 10 | 
                from django.shortcuts import render  | 
            
| 11 | 11 | 
                from django_q.tasks import async  | 
            
| 12 | 12 | 
                from logit import logit  | 
            
| 13 | 
                -from redis_extensions import multi_pop  | 
            |
| 14 | 13 | 
                from rest_framework import viewsets  | 
            
| 15 | 14 | 
                from TimeConvert import TimeConvert as tc  | 
            
| 16 | 15 | 
                 | 
            
| 17 | 16 | 
                from account.models import LensmanInfo, UserInfo  | 
            
| 18 | 17 | 
                from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo  | 
            
| 19 | 
                -from photo.models import PhotosInfo, UUIDInfo  | 
            |
| 18 | 
                +from photo.models import PhotosInfo  | 
            |
| 20 | 19 | 
                from photo.serializers import PhotosInfoSerializer  | 
            
| 21 | 20 | 
                from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode  | 
            
| 22 | 21 | 
                from utils.error.response_utils import response  | 
            
                @@ -59,7 +58,7 @@ def uuid(request):  | 
            ||
| 59 | 58 | 
                     num = int(request.POST.get('num', 100))
               | 
            
| 60 | 59 | 
                 | 
            
| 61 | 60 | 
                # 从 Redis 中 Pop 中指定数量的 UUID  | 
            
| 62 | 
                - uuids, succeed, left = multi_pop(r, UUID_LIST, num)  | 
            |
| 61 | 
                + uuids, succeed, left = r.multi_pop(UUID_LIST, num)  | 
            |
| 63 | 62 | 
                 | 
            
| 64 | 63 | 
                # 异步更新 UUID 数据库中状态  | 
            
| 65 | 64 | 
                if uuids:  | 
            
                @@ -25,7 +25,7 @@ pep8==1.6.2  | 
            ||
| 25 | 25 | 
                pytz==2015.7  | 
            
| 26 | 26 | 
                records==0.4.3  | 
            
| 27 | 27 | 
                redis==2.10.5  | 
            
| 28 | 
                -redis-extensions==1.0.3  | 
            |
| 28 | 
                +redis-extensions==1.0.4  | 
            |
| 29 | 29 | 
                rlog==0.2  | 
            
| 30 | 30 | 
                shortuuid==0.4.2  | 
            
| 31 | 31 | 
                uWSGI==2.0.11.1  |